From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 5 May 2004 23:21:55 +0000 (+0000)
Subject: (Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22701
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=42e11299362bf85e1d513d714fbf4531421aba58;p=emacs.git

(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
---

diff --git a/src/image.c b/src/image.c
index 4c2bdb440e8..09e497576a4 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3179,13 +3179,16 @@ static int xpm_valid_color_symbols_p P_ ((Lisp_Object));
 /* Indicate to xpm.h that we don't have Xlib.  */
 #define FOR_MSW
 /* simx.h in xpm defines XColor and XImage differently than Emacs.  */
+/* It also defines Display the same way as Emacs, but gcc 3.3 still barfs.  */
 #define XColor xpm_XColor
 #define XImage xpm_XImage
+#define Display xpm_Display
 #define PIXEL_ALREADY_TYPEDEFED
 #include "X11/xpm.h"
 #undef FOR_MSW
 #undef XColor
 #undef XImage
+#undef Display
 #undef PIXEL_ALREADY_TYPEDEFED
 #else
 #include "X11/xpm.h"